Port changes from fox.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Merge pull request #18 from kc284/xs64bit

Port changes from fox.