IH: Small additions and fixes