Attempting to fix some warnings from the nightly builds.