[WIP-02] Travis fixes.