Time small fixes