Update to include latest fixes