Fix #292 & further testing of node shutdown