Fixed some issues with properties