Baadal shutdown issues fixed