Travis fixes

This should be all necessary to fix Travis and the regression tests. 
[ci skip]