fixup proxy and architecture