Minor fixes in preparation for Date formats fix