Added notices where needed.