Purchase Order Fixes