Fixing cycle public/private bugs.