fix registration issues