Some FxCop fixups