Locking structure should be static, just not the properties list.
Minor fix/cleanup