Couple missed fixes