Fixing Travis issues