Added some more workaround for 64 bit problems.