Fixed a couple of glitches noticed during a first big experiment run