Timeout configuration w/fixes