Fixed some bugz