Improve generation of JP2s...