Fix avatar usage in side-comments. Closes #447