More property add fixes.