Slight Addition to Deanna's fixes