Fixes to date selectors