More fixes for regression failures