Fix up work_items feature