Fixed soft shutdown issues