Resolve automation issues