Properly await hot reload (#808)

* Properly wait for hot reload
3 files changed