The Final Fix No.2 - and other repairs