Bug fixes for ESRF squish tests