Fixing shortcut objects, and writing clear cut emit types