Fixed entity pushing, other stuff