Finalize Work Order & COS tweaks