Fix side-comments avatar usage. Closes #447