Registration fixes