Fix the build warnings