A couple of cl-lib fixes (fixes #346)