Fix shutdown + logger