[Fix] Minor fixes.