JTL fixes for lab 4