Fixed bugs for sbcl (1.1.4 at least)