Need to make sure the Java layer clean compiles after my latest changes