Gravatar-related fixes