limit bug fix, time utils cleanup