Fix reloading issues in development