Bugfix for issue where some data source properties were not able to be
changed on first save.