Shortcuts and small fixes