Add signalling for graceful-ish exit