Fixing annotation and segments relation problems.