Fixes to build after structure map refactor in other solution