Fixed shortcuts and stufsf