[Fix] misc