Bug updates for registry and machine config