Fixes issues compiling with the new beamline components -- [incomplete
for beamline]