Regression suite fixes for Travis