Fix manual -> automatic issues