Entity fixes and stuff