Fix merge mistakes (correct date, add missing entries).