fix the bugs in shim
remove debugger