Fixing more shortcut aliases and sources