Resolve make issues, fix fqn in json package