Clean up some warnings that were appearing in consoles, and add some context