Fix Travis build

See commits.