Some commits that should have gone in the previous checkin