[Feature] Fix some