fixes for sync