Update isis-te patch according to code review