Data source fixes