Egypt and Ethiopia fixes