prototypy fixes
same as last but for shortcuts