Update my fork with recent changes.