[WIP] Travis fixes