More hot-fixes