@orta => Registration fixes

More incoming.