Properties fixes
fixes