Miscellaneous fixes from the beamline