Updates to fix registration issues