Reset entity death counter when healing them
Clean up some map loading bugs