Minor changes to the sync message service to bring it in line with master (more like the other way around...)