Fix a timeout for smiling
Improve timeouts