tweaks in automatic shutdown