Tweak content. Closes #2311