Some connection improvements