Fix some 32 bit issues.
Merge branch 'v0.36'