making travis happy, plus some other things