Jerry fixes 2
Jerry fixes 3