Fix FxCop issues
Fixed build errors