diff --git a/command.c b/command.c
index 67a8892c2e..18ca322b53 100644
--- a/command.c
+++ b/command.c
@@ -1,4 +1,4 @@
-/*  RetroArch - A frontend for libretro.
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2017 - Daniel De Matteis
  *  Copyright (C) 2015-2017 - Andrés Suárez
  *  Copyright (C) 2016-2017 - Brad Parker
@@ -328,6 +328,7 @@ static bool command_write_ram(const char *arg)
 }
 #endif
 
+#ifdef HAVE_COMMAND
 static bool command_get_arg(const char *tok,
       const char **arg, unsigned *index)
 {
@@ -368,6 +369,7 @@ static bool command_get_arg(const char *tok,
 
    return false;
 }
+#endif
 
 #if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) && defined(HAVE_COMMAND)
 static bool command_network_init(command_t *handle, uint16_t port)
diff --git a/pkg/msvc/msvc2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj b/pkg/msvc/msvc2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj
index b2d6ea4a60..1da3a2b5e3 100644
--- a/pkg/msvc/msvc2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj
+++ b/pkg/msvc/msvc2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj
@@ -179,7 +179,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -191,7 +191,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -203,7 +203,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -215,7 +215,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -227,7 +227,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -239,7 +239,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
@@ -251,7 +251,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -263,7 +263,7 @@
       <ExceptionHandling>Enabled</ExceptionHandling>
     </ClCompile>
     <Link>
-      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;math;OpenSLES</LibraryDependencies>
+      <LibraryDependencies>%(LibraryDependencies);GLESv2;EGL;dl;z;m;OpenSLES</LibraryDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/pkg/msvc/msvc2017-android/msvc2017-android.Packaging/msvc2017-android.Packaging.androidproj b/pkg/msvc/msvc2017-android/msvc2017-android.Packaging/msvc2017-android.Packaging.androidproj
index 164235698c..68ae46bceb 100644
--- a/pkg/msvc/msvc2017-android/msvc2017-android.Packaging/msvc2017-android.Packaging.androidproj
+++ b/pkg/msvc/msvc2017-android/msvc2017-android.Packaging/msvc2017-android.Packaging.androidproj
@@ -119,7 +119,6 @@
     </AntPackage>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Content Include="res\values\strings.xml" />
     <AntBuildXml Include="build.xml" />
     <AndroidManifest Include="AndroidManifest.xml" />
     <AntProjectPropertiesFile Include="project.properties" />
@@ -140,6 +139,17 @@
     <JavaCompile Include="src\com\retroarch\browser\retroactivity\RetroActivityLocation.java" />
     <JavaCompile Include="src\com\retroarch\browser\retroactivity\RetroActivityPast.java" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="res\drawable-hdpi\ic_launcher.png" />
+    <Content Include="res\drawable-ldpi\ic_launcher.png" />
+    <Content Include="res\drawable-mdpi\ic_launcher.png" />
+    <Content Include="res\drawable-xhdpi\banner.png" />
+    <Content Include="res\drawable-xhdpi\ic_launcher.png" />
+    <Content Include="res\drawable-xhdpi\ouya_icon.png" />
+    <Content Include="res\drawable-xxhdpi\ic_launcher.png" />
+    <Content Include="res\drawable-xxxhdpi\ic_launcher.png" />
+    <Content Include="res\drawable\banner.png" />
+  </ItemGroup>
   <Import Project="$(AndroidTargetsPath)\Android.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>
\ No newline at end of file