A few bug fixes, fixed issue when update event crashed.