More unbreaking of things