More fixes after profile split. Fix upgrade steps and registry.xml