WM: More avatar header fixes