PAReview fixes (Batch 1)