DisconnectedLogic fixes