[Jms]: Fixed some issues related to new changes