Fixing the build and quieting warnings.