Sync with latest source modifications