Additional fixes to registry behavior processing