Wrapper and version label fixes