Fixing the build to remove warnings.