Procurement and other misc modules changes.