Fix some bugz