Made JTL fixes