Fix clobbered changes