Merge "Resolves a few gcc warnings"