Merge "Fix some compilation warnings"