Small directory fixes