Fixes ContextMenu and OSX Implementation