Bug fixes, wording for no-push-setting.