fixes for synch dialog
merge latest