Fix some messages during registration