Fixed Date related issues