minor changes in messageing service