Fix commented roles and tasks