Fixes to properties