Add OSX build. Fix snapshot handles