Few defects fixed