Fixup core option entries