Resolve issues from unnesting signups