Improvements to cycle-checking