Fixes to date picker