more Jerry fixes