#1 Fixes on the new property serialization lifecycle