Fixing date picker issues