Cyclereact fixes