Minor fixes at register process