Tweaks to wrapping/unwrapping for Beta6->GM