Fix: Made API shutdown more robust