Couple a fixes