Fix some shortcuts