More cycle avoidance fixes