More warning cleanup