Attempt to fix travis-ci builds