Fixed start-stop events a bit.