Final 250 fixes