some avatar fixes