Some adjustments to aid testing