Tidy up some little wrinkles in Inject node html labels etc