Bit of fixing up