Community service fixes