A few bugfixes for the cycle feature