Fixup - reorder properties