EmirH: fixed small issues