680 S1 fixes according to Tarek's recommendation