Small adjustments, semi-proper shutdown