Fixing issues with image annotation in the new api.