Minor reorg and fixes of ancient origins