Fix issues with HMDA definition