diff --git a/code/debug-int.lisp b/code/debug-int.lisp
index be940e95fe9e9f896ee50cc6b199d83e22a6fd3e..41068c578bed0c879e231f2216d75fb94d5b14fc 100644
--- a/code/debug-int.lisp
+++ b/code/debug-int.lisp
@@ -799,15 +799,15 @@
 				   vm:word-bytes))
 		       (get-context-value
 			real
-			c::lra-save-offset
+			vm::lra-save-offset
 			(c::compiled-debug-function-return-pc c-d-f))
 		       frame)
 		      frame)))
 		  (bogus-debug-function
 		   (let ((fp (frame-pointer real)))
 		     (compute-calling-frame (sap-ref-sap fp
-							 c::old-fp-save-offset)
-					    (stack-ref fp c::lra-save-offset)
+							 vm::old-fp-save-offset)
+					    (stack-ref fp vm::lra-save-offset)
 					    frame))))))
 	down)))
 
@@ -850,11 +850,11 @@
 		       t))
       (when (= (sap-int frame-pointer)
 	       (alien-access
-		(mach:int-array-ref regs c::fp-offset)))
+		(mach:int-array-ref regs vm::fp-offset)))
 	(system:without-gcing
 	 (let ((code (code-object-from-bits
 		      (alien-access
-		       (mach:int-array-ref regs c::code-offset)))))
+		       (mach:int-array-ref regs vm::code-offset)))))
 	   (when (symbolp code)
 	     (return (values code 0 (alien-value sc))))
 	   (let* ((code-header-len (* (get-header-data code) vm:word-bytes))
@@ -877,7 +877,7 @@
 	       ;; the pc.
 	       (setf pc-offset
 		     (- (escape-register (alien-value sc)
-					 c::lra-offset)
+					 vm::lra-offset)
 			(get-lisp-obj-address code)
 			code-header-len)))
 	     (return
diff --git a/code/extensions.lisp b/code/extensions.lisp
index 1274319f9356956ba557cba78b6376e02b01e2be..6c9d433bd15111099368107038c1f6acb69bdce5 100644
--- a/code/extensions.lisp
+++ b/code/extensions.lisp
@@ -566,6 +566,5 @@
 (defun cache-hash-eq (x)
   "Return an EQ hash of X.  The value of this hash for any given object can (of
   course) change at arbitary times."
-  (the fixnum (ash (the fixnum (%primitive make-fixnum x))
-		   -3)))
+  (the fixnum (ash (truly-the fixnum (%primitive lisp::make-fixnum x)) -3)))