Feature/cfy 606 final fixes