More compact png and other fix