Little cleanup, possible fix for registry proxy