Should fix launch and shutdown issues.