Fixes to start/stop