More fixes to hierarchy