Fixed some more Travis issues