Some hot fixes