Minor debugger and rerailer improvements

No hurry to merge, just making a request so you can merge whenever