FIX Key related regressions