[PATCH 0/2] SA_IMMUTABLE fixes