Fixes to Properties module