Some fixes in iconpack work and in other code