fixed registry and terms inference issues