fixes to hot-reload