fixes to creating shortcuts