fixed issues around options_shortcut.