[WIP-02] More fixes to keep travis happy.