Fix up stage settings for bug 840768