Update for Mac and editor config