Date control fixes