Minor rerailer and debugger fixes