Root wrapping. Small improvements