Fix issues for PR