Fix some PNG usage