Various fix and optimisations for zoom and connections