Fixing avatar URL and others