Entity spawn improvements