More fxcop fixes

This changes leads to a no fxcop issue, this way we'll be able to run the fxcop check in our ci.