WIP: Fix Travis-CI errors.