Many fixes for harakah