Clean up some SuppressWarnings irritations and other minor warnings