finish directory fixes