Defects fixed