Update with latest fixes.