Fix some change handling corner cases. More debug output.