Added more places to fire propertychanges