Fixes for cycles