More fixing up