Tank Sync Fixes