protocol: Lookup fixes and improvements