Updated based on references fixes.