more PR fixes