Minor fixes

Minor fixes
+ Minor updates to properties.