Fix for exported non-pointer types
Merge branch 'bug/module-exported-types'