Clean up some warnings about @Override