Nested directors fixes