Merge "build warnings"