Registration improvements and fixes