Finish up entity updates