Cleanup wrapper usage and fix 32 bit