Changes to prevent build failure on 32-bit systems