Fixes required for registry v0.9.0