Fix Deficiencies