Improve start/stop routines.