DataAcquisition: Make various fixes resulting from testing