Fixes after rebase
travisplexer: pr-574-osx travis ci test