Some more hot fixes