Post re-structur fixup