[Fix] Fix stupid bugs