Fix travis build

Partially closes #486