Even more attempts at Fixing wrapper generation