[Fix] Fix some stupid problems