Pooja : few fixes