PNG improvements