Added support for 64bits compile.
Clean-up.