Fixup: logging
Fixup: shortcuts
Removed log shortcut