Fixing Travis build errors