Fixes for deep comparisons