update to use latest fixes