[PATCH v4 7/7] more fixes