registration fixes
Registration fixes. Merge branch 'ledovsky'