[PP] Minor updates after Mat Carey's reading