Changes for 64bit gcc