Various small bug fixes during Neutze beamtime