Bug fixes for Register plugin #41