More bug fixes for herosheets domain model refactor