Just a bit more warning cleanup