[PATCH 0/2] SG_NONE fix and cleanup