--Fixed enumeration modification exception when disposing of Entities
--Fixed threading issue causing an occasional null exception on Entity event