Various fixes (to content Travis)