Fix up some fxcop issues.