more date hack fixes