fixing demos to use current arch (builds wip otherwise)