Restart & registry fixes