Some hot-fixes