CUP fixes

ICClass:icclass etc.