Reformated and fixed minor warnings caused by updates to Java.