Fixed work items discussed with David