Pass correct arguments to shortcut functions