Try more travis fixes