Changes related to libtime_genoff