More fixing of the stuff