diff --git a/bsnes/snes/chip/dsp1/dsp1emu.cpp b/bsnes/snes/chip/dsp1/dsp1emu.cpp
index d933b11c..5138126e 100755
--- a/bsnes/snes/chip/dsp1/dsp1emu.cpp
+++ b/bsnes/snes/chip/dsp1/dsp1emu.cpp
@@ -17,9 +17,11 @@ Dsp1::Dsp1()
 uint8 Dsp1::getSr()
 {
    mSrLowByteAccess = ~mSrLowByteAccess;
-   if (mSrLowByteAccess)
-      return 0;
-   else
+//Overload: only high 8-bits are accessible externally
+//this is required for "Ace wo Nerae!"
+//   if (mSrLowByteAccess)
+//      return 0;
+//   else
       return mSr;
 }
 
diff --git a/bsnes/snes/cpu/cpu.hpp b/bsnes/snes/cpu/cpu.hpp
index dd7412a7..2f498242 100755
--- a/bsnes/snes/cpu/cpu.hpp
+++ b/bsnes/snes/cpu/cpu.hpp
@@ -100,8 +100,8 @@ private:
     uint8 wrdivb;
 
     //$4207-$420a
-    uint10 hirq_pos;
-    uint10 virq_pos;
+    uint9 hirq_pos;
+    uint9 virq_pos;
 
     //$420d
     unsigned rom_speed;
diff --git a/bsnes/snes/snes.hpp b/bsnes/snes/snes.hpp
index b255dad6..44b35103 100755
--- a/bsnes/snes/snes.hpp
+++ b/bsnes/snes/snes.hpp
@@ -1,7 +1,7 @@
 namespace SNES {
   namespace Info {
     static const char Name[] = "bsnes";
-    static const char Version[] = "070.16";
+    static const char Version[] = "070.17";
     static const unsigned SerializerVersion = 14;
   }
 }
diff --git a/bsnes/ui-qt/debugger/debugger.cpp b/bsnes/ui-qt/debugger/debugger.cpp
index 21eadcf0..0bde0cba 100755
--- a/bsnes/ui-qt/debugger/debugger.cpp
+++ b/bsnes/ui-qt/debugger/debugger.cpp
@@ -132,7 +132,7 @@ void Debugger::modifySystemState(unsigned state) {
   file fp;
 
   if(state == Utility::LoadCartridge) {
-    if(config().debugger.cacheUsageToDisk && fp.open(usagefile, file::mode_read)) {
+    if(config().debugger.cacheUsageToDisk && fp.open(usagefile, file::mode::read)) {
       fp.read(SNES::cpu.usage, 1 << 24);
       fp.read(SNES::smp.usage, 1 << 16);
       fp.close();
@@ -143,7 +143,7 @@ void Debugger::modifySystemState(unsigned state) {
   }
 
   if(state == Utility::UnloadCartridge) {
-    if(config().debugger.cacheUsageToDisk && fp.open(usagefile, file::mode_write)) {
+    if(config().debugger.cacheUsageToDisk && fp.open(usagefile, file::mode::write)) {
       fp.write(SNES::cpu.usage, 1 << 24);
       fp.write(SNES::smp.usage, 1 << 16);
       fp.close();
diff --git a/bsnes/ui-qt/debugger/tools/memory.cpp b/bsnes/ui-qt/debugger/tools/memory.cpp
index 261c9011..a4df84a8 100755
--- a/bsnes/ui-qt/debugger/tools/memory.cpp
+++ b/bsnes/ui-qt/debugger/tools/memory.cpp
@@ -141,7 +141,7 @@ void MemoryEditor::importMemory() {
 
 void MemoryEditor::exportMemory(SNES::Memory &memory, const string &filename) const {
   file fp;
-  if(fp.open(filename, file::mode_write)) {
+  if(fp.open(filename, file::mode::write)) {
     for(unsigned i = 0; i < memory.size(); i++) fp.write(memory.read(i));
     fp.close();
   }
@@ -149,7 +149,7 @@ void MemoryEditor::exportMemory(SNES::Memory &memory, const string &filename) co
 
 void MemoryEditor::importMemory(SNES::Memory &memory, const string &filename) const {
   file fp;
-  if(fp.open(filename, file::mode_read)) {
+  if(fp.open(filename, file::mode::read)) {
     unsigned filesize = fp.size();
     for(unsigned i = 0; i < memory.size() && i < filesize; i++) memory.write(i, fp.read());
     fp.close();
diff --git a/bsnes/ui-qt/debugger/tracer.cpp b/bsnes/ui-qt/debugger/tracer.cpp
index 9d814f4b..42898d1c 100755
--- a/bsnes/ui-qt/debugger/tracer.cpp
+++ b/bsnes/ui-qt/debugger/tracer.cpp
@@ -29,7 +29,7 @@ void Tracer::setCpuTraceState(int state) {
   traceCpu = (state == Qt::Checked);
 
   if(traceCpu && !tracefile.open()) {
-    tracefile.open(string() << config().path.data << "trace.log", file::mode_write);
+    tracefile.open(string() << config().path.data << "trace.log", file::mode::write);
   } else if(!traceCpu && !traceSmp && tracefile.open()) {
     tracefile.close();
   }
@@ -39,7 +39,7 @@ void Tracer::setSmpTraceState(int state) {
   traceSmp = (state == Qt::Checked);
 
   if(traceSmp && !tracefile.open()) {
-    tracefile.open(string() << config().path.data << "trace.log", file::mode_write);
+    tracefile.open(string() << config().path.data << "trace.log", file::mode::write);
   } else if(!traceCpu && !traceSmp && tracefile.open()) {
     tracefile.close();
   }