Fixed date picker issues