Clean up some warning messages