Fix typo and cleaner shutdown fix.