Line fixes (OS community friendly