[WIP-02] Travis testing fixes.