more loopback fixes