Minor fix issues.