Document: fixes from the old branch