Changes required by SBCL 1.0.22