Few minor cleanups on registration status.