Fixing start/end dates