[Fix] minor fixes