diff --git a/compat.go b/compat.go
index b61769658..e769fb0d5 100644
--- a/compat.go
+++ b/compat.go
@@ -26,7 +26,7 @@ func registerFlagCompletion(cmd *cobra.Command) {
 		if !storage.hasFlag(cmd, f.Name) {
 			return // skip if not defined in carapace
 		}
-		if _, ok := cmd.GetFlagCompletionByName(f.Name); ok {
+		if _, ok := cmd.GetFlagCompletionFunc(f.Name); ok {
 			return // skip if already defined in cobra
 		}
 
diff --git a/storage.go b/storage.go
index ede4fef50..b937885e2 100644
--- a/storage.go
+++ b/storage.go
@@ -94,7 +94,7 @@ func (s _storage) getFlag(cmd *cobra.Command, name string) Action {
 
 		flagAction, ok := entry.flag[name]
 		if !ok {
-			if f, ok := cmd.GetFlagCompletionByName(name); ok {
+			if f, ok := cmd.GetFlagCompletionFunc(name); ok {
 				flagAction = ActionCobra(f)
 			}
 		}
diff --git a/traverse.go b/traverse.go
index 6b7cbf79a..eb8a747b9 100644
--- a/traverse.go
+++ b/traverse.go
@@ -26,7 +26,7 @@ func traverse(cmd *cobra.Command, args []string) (Action, Context) {
 	fs := pflagfork.FlagSet{FlagSet: cmd.Flags()}
 
 	context := NewContext(args...)
-	context.cmd = c
+	context.cmd = cmd
 loop:
 	for i, arg := range context.Args {
 		switch {