Fixed misc. issues raised by FxCop