Fixes/32bit luvit support