Fixes for scaling proxy and native charm

No match.