Try a better fix for Travis build errors