diff --git a/context.go b/context.go
index 315c2fb596..dbf50e495f 100644
--- a/context.go
+++ b/context.go
@@ -82,7 +82,27 @@ func (cCtx *Context) IsSet(name string) bool {
 func (cCtx *Context) LocalFlagNames() []string {
 	var names []string
 	cCtx.flagSet.Visit(makeFlagNameVisitor(&names))
-	return names
+	// Check the flags which have been set via env or file
+	if cCtx.Command != nil && cCtx.Command.Flags != nil {
+		for _, f := range cCtx.Command.Flags {
+			if f.IsSet() {
+				names = append(names, f.Names()...)
+			}
+		}
+	}
+
+	// Sort out the duplicates since flag could be set via multiple
+	// paths
+	m := map[string]struct{}{}
+	var unames []string
+	for _, name := range names {
+		if _, ok := m[name]; !ok {
+			m[name] = struct{}{}
+			unames = append(unames, name)
+		}
+	}
+
+	return unames
 }
 
 // FlagNames returns a slice of flag names used by the this context and all of
@@ -90,7 +110,7 @@ func (cCtx *Context) LocalFlagNames() []string {
 func (cCtx *Context) FlagNames() []string {
 	var names []string
 	for _, pCtx := range cCtx.Lineage() {
-		pCtx.flagSet.Visit(makeFlagNameVisitor(&names))
+		names = append(names, pCtx.LocalFlagNames()...)
 	}
 	return names
 }
diff --git a/docs/v2/examples/flags.md b/docs/v2/examples/flags.md
index 44c643a397..873c6ff7e7 100644
--- a/docs/v2/examples/flags.md
+++ b/docs/v2/examples/flags.md
@@ -51,7 +51,8 @@ func main() {
 ```
 
 You can also set a destination variable for a flag, to which the content will be
-scanned.
+scanned. Note that if the `Value` is set for the flag, it will be shown as default,
+and destination will be set to this value before parsing flag on the command line.
 
 <!-- {
   "output": "Hello someone"
diff --git a/flag.go b/flag.go
index a6fea1c493..7535424c04 100644
--- a/flag.go
+++ b/flag.go
@@ -5,6 +5,7 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"regexp"
 	"runtime"
 	"strings"
@@ -268,19 +269,23 @@ func prefixedNames(names []string, placeholder string) string {
 	return prefixed
 }
 
-func withEnvHint(envVars []string, str string) string {
-	envText := ""
+func envFormat(envVars []string, prefix, sep, suffix string) string {
 	if len(envVars) > 0 {
-		prefix := "$"
-		suffix := ""
-		sep := ", $"
-		if runtime.GOOS == "windows" {
-			prefix = "%"
-			suffix = "%"
-			sep = "%, %"
-		}
+		return fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
+	}
+	return ""
+}
 
-		envText = fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
+func defaultEnvFormat(envVars []string) string {
+	return envFormat(envVars, "$", ", $", "")
+}
+
+func withEnvHint(envVars []string, str string) string {
+	envText := ""
+	if runtime.GOOS != "windows" || os.Getenv("PSHOME") != "" {
+		envText = defaultEnvFormat(envVars)
+	} else {
+		envText = envFormat(envVars, "%", "%, %", "%")
 	}
 	return str + envText
 }
diff --git a/flag_test.go b/flag_test.go
index 6e03582ff4..d46c1a70f7 100644
--- a/flag_test.go
+++ b/flag_test.go
@@ -239,6 +239,10 @@ func TestFlagsFromEnv(t *testing.T) {
 					t.Errorf("Flag %s not set", f.Names()[0])
 				}
 
+				// check that flag names are returned when set via env as well
+				if !reflect.DeepEqual(ctx.FlagNames(), test.flag.Names()) {
+					t.Errorf("Not enough flag names %+v", ctx.FlagNames())
+				}
 				return nil
 			},
 		}
diff --git a/sliceflag_test.go b/sliceflag_test.go
index 179020b14f..83374172c8 100644
--- a/sliceflag_test.go
+++ b/sliceflag_test.go
@@ -156,8 +156,8 @@ func ExampleMultiStringFlag() {
 	//---
 	//Setting all flags via environment...
 	//
-	//Flag names: []
-	//Local flag names: []
+	//Flag names: ["flag-one" "1" "two" "2" "flag-three" "3" "flag-four" "4"]
+	//Local flag names: ["flag-one" "1" "two" "2" "flag-three" "3" "flag-four" "4"]
 	//Context values:
 	//"flag-one"=["v 9" "v 10"]
 	//"two"=["v 11" "v 12"]