more hot fixes