small mergefixes
Merge branch 'daniel'