Bug fixes

Dindrenzi and Directorate bug fixes.