Created by: tgrego
This changes fix underlying issues in the code found when working on ENSCORESW-3022.