try this
Couple missed fixes