fixes from nextend/phpflickr