Follow up on Google Pic #389

@simong: Some minor comments remain in #389