Clean up some yellow warnings