fixes to makematte and imagefill