fixing some time issues in events