Small improvements of wrap.