Data Source update fixes