Few more fixes for OSX. Add requirement around gem.