Some more warning cleanup