WIP - fix builds failing on Travis CI