[PATCH v4 4/4] Fixes