Minor fixes & improvements.
Minor fix/improvement.