A bunch of smaller fixes for jenkins and travis.