Some cosmetic adjustments to registration et al