Fixes for OSX build. Completion correction.