fixes to make Connect pass tests