diff --git a/Makefile b/Makefile
index dbd39dd5..d62eec00 100644
--- a/Makefile
+++ b/Makefile
@@ -249,7 +249,7 @@ else
 endif
 
 
-install: compile_lib $(PKGCFGF)
+install: all $(PKGCFGF)
 	mkdir -p $(LIBDIR)
 ifeq ($(UNICORN_SHARED),yes)
 	$(INSTALL_LIB) $(LIBRARY) $(LIBDIR)
diff --git a/bindings/java/Makefile b/bindings/java/Makefile
old mode 100755
new mode 100644
diff --git a/bindings/java/samples/Sample_arm.java b/bindings/java/samples/Sample_arm.java
old mode 100755
new mode 100644
diff --git a/bindings/java/samples/Sample_arm64.java b/bindings/java/samples/Sample_arm64.java
old mode 100755
new mode 100644
diff --git a/bindings/java/samples/Sample_m68k.java b/bindings/java/samples/Sample_m68k.java
old mode 100755
new mode 100644
diff --git a/bindings/java/samples/Sample_mips.java b/bindings/java/samples/Sample_mips.java
old mode 100755
new mode 100644
diff --git a/bindings/java/samples/Sample_sparc.java b/bindings/java/samples/Sample_sparc.java
old mode 100755
new mode 100644
diff --git a/bindings/java/samples/Sample_x86.java b/bindings/java/samples/Sample_x86.java
old mode 100755
new mode 100644
diff --git a/bindings/java/samples/Shellcode.java b/bindings/java/samples/Shellcode.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/Arm64Regs.java b/bindings/java/unicorn/Arm64Regs.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/ArmRegs.java b/bindings/java/unicorn/ArmRegs.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/BlockHook.java b/bindings/java/unicorn/BlockHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/CodeHook.java b/bindings/java/unicorn/CodeHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/Hook.java b/bindings/java/unicorn/Hook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/InHook.java b/bindings/java/unicorn/InHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/InterruptHook.java b/bindings/java/unicorn/InterruptHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/M68kRegs.java b/bindings/java/unicorn/M68kRegs.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/MemoryInvalidHook.java b/bindings/java/unicorn/MemoryInvalidHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/MipsRegs.java b/bindings/java/unicorn/MipsRegs.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/OutHook.java b/bindings/java/unicorn/OutHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/ReadHook.java b/bindings/java/unicorn/ReadHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/ReadWriteHook.java b/bindings/java/unicorn/ReadWriteHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/SparcRegs.java b/bindings/java/unicorn/SparcRegs.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/SyscallHook.java b/bindings/java/unicorn/SyscallHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/Unicorn.java b/bindings/java/unicorn/Unicorn.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/UnicornArchs.java b/bindings/java/unicorn/UnicornArchs.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/UnicornErrors.java b/bindings/java/unicorn/UnicornErrors.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/UnicornException.java b/bindings/java/unicorn/UnicornException.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/UnicornHooks.java b/bindings/java/unicorn/UnicornHooks.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/UnicornModes.java b/bindings/java/unicorn/UnicornModes.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/WriteHook.java b/bindings/java/unicorn/WriteHook.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/X86Instructions.java b/bindings/java/unicorn/X86Instructions.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn/X86Regs.java b/bindings/java/unicorn/X86Regs.java
old mode 100755
new mode 100644
diff --git a/bindings/java/unicorn_Unicorn.c b/bindings/java/unicorn_Unicorn.c
old mode 100755
new mode 100644
diff --git a/qemu/softmmu_template.h b/qemu/softmmu_template.h
index fa0bd630..2bc357d8 100755
--- a/qemu/softmmu_template.h
+++ b/qemu/softmmu_template.h
@@ -198,6 +198,8 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
             // printf("***** Invalid memory read at " TARGET_FMT_lx "\n", addr);
             cpu_exit(env->uc->current_cpu);
             return 0;
+        } else {
+            env->invalid_error = UC_ERR_OK;
         }
     }
 
@@ -233,6 +235,8 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
             // printf("Invalid memory read at " TARGET_FMT_lx "\n", addr);
             cpu_exit(env->uc->current_cpu);
             return 0;
+        } else {
+            env->invalid_error = UC_ERR_OK;
         }
 
         /* ??? Note that the io helpers always read data in the target
@@ -316,6 +320,8 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
             // printf("***** Invalid memory read at " TARGET_FMT_lx "\n", addr);
             cpu_exit(env->uc->current_cpu);
             return 0;
+        } else {
+            env->invalid_error = UC_ERR_OK;
         }
     }
 
@@ -474,6 +480,8 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
             // printf("***** Invalid memory write at " TARGET_FMT_lx "\n", addr);
             cpu_exit(env->uc->current_cpu);
             return;
+        } else {
+            env->invalid_error = UC_ERR_OK;
         }
     }
 
@@ -586,6 +594,8 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
             // printf("***** Invalid memory write at " TARGET_FMT_lx "\n", addr);
             cpu_exit(env->uc->current_cpu);
             return;
+        } else {
+            env->invalid_error = UC_ERR_OK;
         }
     }
 
diff --git a/regress/Makefile b/regress/Makefile
old mode 100755
new mode 100644
diff --git a/regress/block_test.c b/regress/block_test.c
old mode 100755
new mode 100644
diff --git a/samples/sample_x86.c b/samples/sample_x86.c
index b0dec117..4e4a736d 100644
--- a/samples/sample_x86.c
+++ b/samples/sample_x86.c
@@ -725,6 +725,7 @@ static void test_x86_16(void)
 
     uc_close(&handle);
 }
+
 int main(int argc, char **argv, char **envp)
 {
     if (argc == 2) {