Fixes on orders