Fix some more Wrapper places.