Fixing some ZSK format issues