BMH: Making the build a little more sane, fixing up a bunch of small errors, in prep to getting the functional tests working again
fixing the build
fixing the build