Fixed issues with date picker