Fix Travis build

See commits.

/cc @jordanmccullough