Minor clarifications

These are the changes that would have made it much easier to get flickr working.