Get this passing on 32 as well as 64 bit platforms.