Fix date not set errors