Fixes for comparison mode