Further GetImage related improvements