Fix server-bound entity ids as well