Couple fixes from previous commit