Follow up edits