Update events and small patches for ES