Broken stuff update

Stuff broke. Stuff fixed. All good