Fixes to fast_comparison