HM7 - directive fixes