Third round of PR fixes