Further fixes on switching prefixes on the same package/having arguments per architecture