Some additional chamges from Jol github