fixes from lars