Fixes for unwrapping/wrapping