More PR fixes