Cleaning up a lot of warnings.