Minor cleanup to get linux happy again.