More JTL fixes for intro 1