Fixes some custom avatar conflicts