Entity fixes and tick event