Fixes in OrderProvider when order get executed