more fixes for dealing with . in the names of properties