Update with latest fixes