fixes for amd64 compilation
3 files changed