Adding some fixes for DataPoints/DataSources that have missing modules.
More is necessary but some design needs to be done first.