[PATCH v6 0/8] Second part of bug-fixes series