Registration, minor changes