Fixed some parts of Entity rendering