fix some buggies