Fix bad connections to controls that were removed from exposed control set.
Merge branch 'newXRFDetector' of github.com:acquaman/acquaman into newXRFDetector