Fixed some Travis build errors