diverse fixes
Merge branch 'pim'