Tweaks before OpenHelp