bugfixes for Anatomy
Merge branch 'anatomy-bugfixes3' into dev