Put the right components on the right wrappers

Some wrappers needs some components like readonly.

Fixes #1096