diff --git a/extensions/vi-mode/binds.lisp b/extensions/vi-mode/binds.lisp
index 1954f9eaf..be10e0ace 100644
--- a/extensions/vi-mode/binds.lisp
+++ b/extensions/vi-mode/binds.lisp
@@ -39,6 +39,9 @@
 (define-key *motion-keymap* "B" 'vi-backward-word-begin-broad)
 (define-key *motion-keymap* "e" 'vi-forward-word-end)
 (define-key *motion-keymap* "E" 'vi-forward-word-end-broad)
+(define-key *motion-keymap* "g ^" 'move-to-beginning-of-line)
+(define-key *motion-keymap* "g 0" 'move-to-beginning-of-line)
+(define-key *motion-keymap* "g $" 'move-to-end-of-line)
 (define-key *motion-keymap* "$" 'vi-move-to-end-of-line)
 (define-key *motion-keymap* "g _" 'vi-move-to-last-nonblank)
 (define-key *motion-keymap* "H" 'vi-move-to-window-top)
diff --git a/extensions/vi-mode/ex-command.lisp b/extensions/vi-mode/ex-command.lisp
index 52fab719c..f67d9aef2 100644
--- a/extensions/vi-mode/ex-command.lisp
+++ b/extensions/vi-mode/ex-command.lisp
@@ -67,7 +67,7 @@
   (lem-vi-mode/commands:vi-window-split-vertically-new 1 filename))
 
 (define-ex-command "^vne(?:w)?$" (range filename)
-  (declare (ignore range filename))
+  (declare (ignore range))
   (lem-vi-mode/commands:vi-window-split-horizontally-new 1 filename))
 
 (define-ex-command "^ene(?:w)?$" (range filename)