xt_time: a few more fixes from upstream