Few travis fixes