Remove log spam and fix timeout
Fix warning