Fixes for issues finding original class files based upon decompiled resu...

...lts