Some more refinements for hot reload mode.