* Fixed registration bugs