Properties fixup