1.0.4.16: some GC and interrupt refactoring