Fix a couple of paths to use _ARCH variable