Fixing remaining JLoader calls