Fixes for syncing.