Fixing structMerge, misc changes