fix PR problems