Update code to last fw changes.