Date and bug fix