Clean up bunch of warnings.