Couple more missing fixes