Updates for 64bit compilation environments