Add back x64 support