fixes build and fixes import of defintions from helper.scm into madrid.scm