Updates to support Pillow (new PIL)