Fix some errors matching certain instructions
Fix raising errors from linker