Small changes for PR