Fixes related to CONN-613,614,615 and 616