More hklm variable fixes.