Wrap + few fixes