Contains fixes for 'ended' event and time conversions