Fixed issues relating to 32-bit and 64-bit compilation of framework.