Some fixes in Property and SetProperty