A little more fixing up