Minor fix.
Minor optimizations.
Minor fix.