Fix remaining Java failures