Improved handling of devdrawretina