Fixed some bugs involving names when unwinding