Build/link directory fixes