Changes needed for AMD64