new API & connection error fixes