Jerry fixes