Fix Travis-CI builds