Fixes timestamp and ping logic