fix most failing specs