Unreviewed, build fix for 32bit