More cycle fixes