Fixed some issues on draft control syncing.