r11122: Fix some talloc hierarchy errors