Nubians, other fixes
Yet more fixes, removing north african retinues