Second attempt to resolve Travis build errors