Warnings now fixed for both 32 and 64-bit builds