Fixed some silly time event/time stamp issues