Move to a better timeout model
Fix unicode issues