fix compilation for 32 bit targets
Merge branch 'experimental'