patch up more missing changes that live in production