Add fixes for travis