Even more fixes for orders