Fixed shortcut collisions on OSX