Fixed stop/start issues