Tweaked date parsing yet again