Some more to_date nil fixes