OSX related changes + plugins