Fixed start/stop issues.