Fix settings, monkey patch shortcut methods for demo