Fixing shortcut issues with different platforms (OSX)