Fixes to Java exam1