Misc fixes
Finalized date