Fix date and ordering