Don't restart if already started
Bug fixes