multiple issues
1. make valid date nullable
2. fix allocation changes