Include amd64 in special handling