Further registration fixes. Registration works now.