Clean up bogus warnings