Proper scheme fixes