Auto-shutdown database fix
Fix imports