Merge "Fix build warnings"