fixes for in-progress xrf_detectors module