[Fix] Just a few optimization.