Fixing project build issue.
Fixing potential issue with shutting down.