Sync with recent changes