The first fix changes get_wchan() and the second one fixed what DaveM noticed.
Attach a file by drag & drop or click to upload