Changes required by SBCL