Fixed up some feedback from PM Review.