More minor fixes relating to synchronization