[Fix] minor bugs