Fixed some buges