Fix marhshalling of NS and SS attribute values