diff --git a/plugins/aliases/cheatsheet.py b/plugins/aliases/cheatsheet.py
index 61bf5f956..d4e35c4ee 100644
--- a/plugins/aliases/cheatsheet.py
+++ b/plugins/aliases/cheatsheet.py
@@ -6,7 +6,9 @@ import argparse
 
 def parse(line):
     left = line[0:line.find('=')].strip()
-    right = line[line.find('=')+1:].strip('\'"\n ')
+    right = line[line.find('=')+1:].strip('\n ')
+    if len(right) >= 2 and right[0] == right[-1] and right[0] in '\'"':
+        right = right[1:-1]
     try:
         cmd = next(part for part in right.split() if len([char for char in '=<>' if char in part])==0)
     except StopIteration:
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 7d5db2068..b04923103 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -30,6 +30,13 @@ if [[ -z "$HOMEBREW_PREFIX" ]]; then
   export HOMEBREW_PREFIX="$(brew --prefix)"
 fi
 
+# Ensure Homebrew's sbin directory is in PATH, as brew shellenv may not always
+# be sourced (e.g. when brew is already on PATH from a prior shellenv call).
+# This avoids "Homebrew's sbin was not found in your PATH" warnings.
+if [[ -d "$HOMEBREW_PREFIX/sbin" ]] && [[ ":$PATH:" != *":$HOMEBREW_PREFIX/sbin:"* ]]; then
+  export PATH="$HOMEBREW_PREFIX/sbin:$PATH"
+fi
+
 if [[ -d "$HOMEBREW_PREFIX/share/zsh/site-functions" ]]; then
   fpath+=("$HOMEBREW_PREFIX/share/zsh/site-functions")
 fi