Add support for wayward changes