Fix some regressions handling operator preferences