Unshield fixes

Fix for some cds + made  unshield_fix_ini slightly less ugly