Minor updates
Fixed bug in property parsing throwing a type error