Fixes to EventLog creation