fix at least some of the failures on travis