Registration fixes.