Remove @Override from various methods
Fix java version