Last bit in avatar fixes.
paul