Final try to resolve Travis build errors