Connect fixes