Cycle breaker and Bug fixes