Fix crash on shoot; Fix ovw remove bug;