JTL fixes for lab 4
Merge remote-tracking branch 'upstream/master'