Bugfixes to ProviderJSON emitter
Merge branch 'my'