Speculative support for OSX shortcuts

Not sure this is really going to work