another set of fixes for travis