Fixed defects