Adding latest fixes.