Fix GCC warning
Fix annoying shutdown error
Cleanup