small fixes and jms cf type