Merge "Fix a few compilation warnings"