Fixed some bugs in work-order-progress