Fix PR1 and PR2