More hacking to support non-weekend dates