Fixes stacked bugs without breaking anything else

Not tested yet: there is no evidence about this capability for this model in the store.

That gap is itself a result: it marks what we do not know.