More wrapping fixes