Fixed some buggies