Handle avatar height weirdness

Supports #341