More PNG fixes (#2839)