Upgrade PNG9 handling