Quick fixes for java