last fixes for documents before 1.7