Minor warning cleanup