Properly fixup the inner attributes