Adaptations to updated JB library