diff --git a/upup/pkg/fi/nodeup/build_flags.go b/upup/pkg/fi/nodeup/build_flags.go
index e733b088e9..df5fb97c16 100644
--- a/upup/pkg/fi/nodeup/build_flags.go
+++ b/upup/pkg/fi/nodeup/build_flags.go
@@ -15,12 +15,13 @@ func buildFlags(options interface{}) (string, error) {
 
 	walker := func(path string, field *reflect.StructField, val reflect.Value) error {
 		if field == nil {
-			glog.V(4).Infof("not writing non-field: %s", path)
+			glog.V(8).Infof("ignoring non-field: %s", path)
 			return nil
 		}
 		tag := field.Tag.Get("flag")
 		if tag == "" {
 			glog.V(4).Infof("not writing field with no flag tag: %s", path)
+			// We want to descend - it could be a structure containing flags
 			return nil
 		}
 		if tag == "-" {
@@ -29,6 +30,8 @@ func buildFlags(options interface{}) (string, error) {
 		}
 		flagName := tag
 
+		// We do have to do this, even though the recursive walk will do it for us
+		// because when we descend we won't have `field` set
 		if val.Kind() == reflect.Ptr {
 			if val.IsNil() {
 				return nil
@@ -54,7 +57,8 @@ func buildFlags(options interface{}) (string, error) {
 		if flag != "" {
 			flags = append(flags, flag)
 		}
-		return nil
+		// Nothing more to do here
+		return utils.SkipReflection
 	}
 	err := utils.ReflectRecursive(reflect.ValueOf(options), walker)
 	if err != nil {
diff --git a/upup/pkg/fi/nodeup/nodetasks/service.go b/upup/pkg/fi/nodeup/nodetasks/service.go
index 145dfce3a4..768b894955 100644
--- a/upup/pkg/fi/nodeup/nodetasks/service.go
+++ b/upup/pkg/fi/nodeup/nodetasks/service.go
@@ -41,7 +41,7 @@ func (p *Service) GetDependencies(tasks map[string]fi.Task) []fi.Task {
 		// We assume that services depend on basically everything
 		typeName := utils.BuildTypeName(reflect.TypeOf(v))
 		switch typeName {
-		case "*CopyAssetTask", "*File", "*Package", "*Sysctl", "*UpdatePackages", "*User", "*Disk":
+		case "*CopyAssetTask", "*File", "*Package", "*Sysctl", "*UpdatePackages", "*UserTask", "*Disk":
 			deps = append(deps, v)
 		case "*Service":
 		// ignore
diff --git a/upup/pkg/fi/utils/reflect.go b/upup/pkg/fi/utils/reflect.go
index 74520a9a99..d4b15e0a5b 100644
--- a/upup/pkg/fi/utils/reflect.go
+++ b/upup/pkg/fi/utils/reflect.go
@@ -91,6 +91,7 @@ func reflectRecursive(path string, v reflect.Value, visitor visitorFunc) error {
 			f := v.Field(i)
 
 			childPath := path + "." + structField.Name
+			// TODO: I think we are double visiting here; we should instead pass down structField into reflectRecursive
 			err := visitor(childPath, &structField, f)
 			if err != nil && err != SkipReflection {
 				return err