diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index be922bfa8b604c61a67d221bb271d8f41bf55f8e..de3228db39af7213aaff7c7486d06640c621bfd3 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -559,12 +559,12 @@ HRESULT VLCPlugin::onLoad(void)
                     LPOLESTR base_url;
                     if( SUCCEEDED(pContMoniker->GetDisplayName(pBC, NULL, &base_url)) )
                     {
-		        /*
-			** check that the moinker is in a URL
-			*/
+                        /*
+                        ** check that the moniker name is a URL
+                        */
                         if( UrlIsW(base_url, URLIS_URL) )
                         {
-			    DWORD len = INTERNET_MAX_URL_LENGTH;
+                            DWORD len = INTERNET_MAX_URL_LENGTH;
                             LPOLESTR abs_url = (LPOLESTR)CoTaskMemAlloc(sizeof(OLECHAR)*len);
                             if( NULL != abs_url )
                             {
@@ -665,9 +665,9 @@ HRESULT VLCPlugin::onAmbientChanged(LPUNKNOWN pContainer, DISPID dispID)
         case DISPID_AMBIENT_TOPTOBOTTOM:
             break;
         case DISPID_UNKNOWN:
-	    /*
-	    ** multiple property change, look up the ones we are interested in
-	    */
+        /*
+        ** multiple property change, look up the ones we are interested in
+        */
             VariantInit(&v);
             V_VT(&v) = VT_BOOL;
             if( SUCCEEDED(GetObjectProperty(pContainer, DISPID_AMBIENT_USERMODE, v)) )
diff --git a/activex/vlccontrol.cpp b/activex/vlccontrol.cpp
index 17b746a47689e8499100a67cb3f48160ca4696ba..c064216312b82c1b9a3aafbd8e00d20943f61f72 100644
--- a/activex/vlccontrol.cpp
+++ b/activex/vlccontrol.cpp
@@ -619,7 +619,7 @@ static HRESULT createTargetOptions(int codePage, VARIANT *options, char ***cOpti
         SafeArrayGetUBound(array, 1, &uBound);
 
         // have we got any options
-        if( uBound > lBound )
+        if( uBound >= lBound )
         {
             VARTYPE vType;
             hr = SafeArrayGetVartype(array, &vType);
@@ -636,7 +636,7 @@ static HRESULT createTargetOptions(int codePage, VARIANT *options, char ***cOpti
                     return E_OUTOFMEMORY;
 
                 ZeroMemory(*cOptions, sizeof(char *)*(uBound-lBound));
-                for(pos=lBound; SUCCEEDED(hr) && (pos<uBound); ++pos )
+                for(pos=lBound; SUCCEEDED(hr) && (pos<=uBound); ++pos )
                 {
                     VARIANT option;
                     hr = SafeArrayGetElement(array, &pos, &option);