Fix time Duration bugs