Fixed more entity stuff.