fix some time units bugs