Fix some minor issues.