Fix all defects