Fix fxcop issues