Some fixes for hotslots, nw