Fixed a few entities