Fixes avatar issues