Fixing various thingies