Fixes to transparent wrapper that allowed all existing tests to compile at least