Adding latest fixes