Fixed some property visibility issues