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