Fixed some issues with communication  on YACC side