a couple of fixes for is_diff