A couple of fixes on srfi-18