avatar fixes, try to gc on migration