More registry fixes.