Fixes for travis CI (still)