Bug fixes with Modulus connectivity