scheme fixes