diff --git a/lib/LaTeXML/Package/TeX.pool.ltxml b/lib/LaTeXML/Package/TeX.pool.ltxml
index 8b0672bc8..18fe7b9db 100644
--- a/lib/LaTeXML/Package/TeX.pool.ltxml
+++ b/lib/LaTeXML/Package/TeX.pool.ltxml
@@ -4980,11 +4980,11 @@ DefMacro('\lx@@typerefnum@@{}',
     . '\@ifundefined{lx@name@#1}{'
     . '\@ifundefined{#1name}{'
     . '}{'
-    . '\lx@refnum@compose{\csname #1name\endcsname}{\lx@the@@{#1}}'
+    . '\lx@refnum@compose{\csname #1name\endcsname}{\csname p@#1\endcsname\lx@the@@{#1}}'
     . '}}{'
-    . '\lx@refnum@compose{\csname lx@name@#1\endcsname}{\lx@the@@{#1}}'
+    . '\lx@refnum@compose{\csname lx@name@#1\endcsname}{\csname p@#1\endcsname\lx@the@@{#1}}'
     . '}}{'
-    . '\lx@refnum@compose{\csname #1typerefname\endcsname}{\lx@the@@{#1}}'
+    . '\lx@refnum@compose{\csname #1typerefname\endcsname}{\csname p@#1\endcsname\lx@the@@{#1}}'
     . '}');
 
 AssignMapping('type_tag_formatter', 'typerefnum' => '\lx@typerefnum@@');
diff --git a/lib/LaTeXML/Package/hyperref.sty.ltxml b/lib/LaTeXML/Package/hyperref.sty.ltxml
index d07afc015..59de5e258 100644
--- a/lib/LaTeXML/Package/hyperref.sty.ltxml
+++ b/lib/LaTeXML/Package/hyperref.sty.ltxml
@@ -217,6 +217,7 @@ DefMacro('\lx@autorefnum@@{}', sub {
       (LookupDefinition(T_CS('\\' . $type_s . 'autorefname'))
         ? (Tokens(T_CS('\\' . $type_s . 'autorefname'), T_CS('\text@nobreakspace')))
         : ()),
+      (LookupDefinition(T_CS('\p@' . $counter)) ? T_CS('\p@' . $counter) : ()),
       T_CS('\the' . $counter)); });
 
 AssignMapping('type_tag_formatter', 'autoref' => '\lx@autorefnum@@');
diff --git a/lib/LaTeXML/Package/subfig.sty.ltxml b/lib/LaTeXML/Package/subfig.sty.ltxml
index 4a509c721..8d8a6fd53 100644
--- a/lib/LaTeXML/Package/subfig.sty.ltxml
+++ b/lib/LaTeXML/Package/subfig.sty.ltxml
@@ -38,7 +38,7 @@ DefPrimitive('\newsubfloat[]{}', sub {
     Let('\ext@sub' . $name, '\ext@' . $name);
     DefMacro('\thesub' . $name,   '\alph{sub' . $name . '}');
     DefMacro('\fnum@sub' . $name, '(\thesub' . $name . ')');
-    DefMacro('\p@sub' . $name,    '(\thesub' . $name . ')');
+    DefMacro('\p@sub' . $name,    '\the' . $name);
     # subcaption above or below?
     # Crazy stuff; if the outer float hasn't seen it's caption yet,
     # we've got to temporarily step it's counter, WITHOUT resetting the subcounter!