Fixed some Entity ridiculousness.