Various changes to try and fix the "Cycle Bug"