Bug fixes regarding <time