Fixed registration issues