Fixing some issues with hot-loading