Java call fixes