More fixing of things