Fixed registration issues.