Remove excess fund and fix bug on win