Fixed deficiencies and conflicts