Additional potential fixes for travis ci