Fixing warnings/errors
Terminology: moved link from headline to content text