Fixed (?) Travis build and test.