Improve connection reliability and config