Order scheme fixes