Some registration changes