Multiple fixes
Fix compilation errors
Fix compilation errors
Fix compilation errors
Fix compilation errors
Fix compilation errors
Fix compilation errors
Fix compilation errors
Fix compilation errors
Fix compilation errors
Proper wrappers
Proper wrappers
Fix android builds
Possible fix for Android