diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 936b5efd6..66b441082 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -83,6 +83,7 @@ LOCAL_PATH_SDL_APPLICATION := $(LOCAL_PATH)
 APP_LIB_DEPENDS := $(foreach LIB, $(LOCAL_SHARED_LIBRARIES), $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LIB).so)) \
 					$(foreach LIB, $(LOCAL_STATIC_LIBRARIES), $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LIB).a))
 
+.NOTPARALLEL: $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libapplication.so) $(LOCAL_PATH)/src/libapplication.so
 
 $(LOCAL_PATH)/src/libapplication.so: $(LOCAL_PATH)/src/AndroidBuild.sh $(LOCAL_PATH)/src/AndroidAppSettings.cfg $(APP_LIB_DEPENDS)
 	echo Launching script $(LOCAL_PATH_SDL_APPLICATION)/AndroidBuild.sh
@@ -92,7 +93,6 @@ $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libapplication.so): $(LOCAL_PAT
 	cp -f $< $@
 
 .PHONY: OVERRIDE_CUSTOM_LIB
-.NOTPARALLEL: $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libapplication.so)
 
 OVERRIDE_CUSTOM_LIB:
 
diff --git a/project/jni/application/scummvm/AndroidBuild.sh b/project/jni/application/scummvm/AndroidBuild.sh
index f1391cd8e..8100218cb 100755
--- a/project/jni/application/scummvm/AndroidBuild.sh
+++ b/project/jni/application/scummvm/AndroidBuild.sh
@@ -23,6 +23,5 @@ ln -sf libflac.a $LOCAL_PATH/../../../obj/local/armeabi/libFLAC.a
 if [ \! -f scummvm/config.mk ] ; then
 	../setEnvironment.sh sh -c "cd scummvm && env LIBS='-lflac -ltremor -logg -lmad -lz -lgcc' ./configure --host=androidsdl --enable-zlib --enable-tremor --enable-mad --enable-flac --enable-vkeybd --enable-verbose-build --disable-hq-scalers --disable-readline --disable-nasm --datadir=."
 fi
-rm -f ../libapplication.so
 ../setEnvironment.sh make -C scummvm -j2
-mv -f scummvm/scummvm libapplication.so
+cp -f scummvm/scummvm libapplication.so
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
index 7f30fff9b..db96b29ff 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
@@ -141,7 +141,7 @@ static SDL_VideoDevice *ANDROID_CreateDevice(int devindex)
 	/* Initialize all variables that we clean on shutdown */
 	device = (SDL_VideoDevice *)SDL_malloc(sizeof(SDL_VideoDevice));
 	if ( device ) {
-		SDL_memset(device, 0, (sizeof *device));
+		SDL_memset(device, 0, sizeof(SDL_VideoDevice));
 	} else {
 		SDL_OutOfMemory();
 		return(0);