One minor patch tidy up