Registration issues fixed