Fix issues with property type change