Various fixes and part of 2-person DE claim implementation