Fix some other JavaFormat issues