Since entities now have unsigned ints instead, I'm guessing we need to update this wherever we handle entities?