misc fixes reported by builders
Get more info from travisci