Bring Java and Windows builds to equality