Fix generic stuff and make --disable-arch option work with defs