Couple fixes