A number of fixes to the event image getter