Working through reliable start/stop fixes