stkh hierarchy fixes