Fixed some SBE37 wonkiness, should pass buildbot tests now...should...